Description:

Fixes #532

Checklist:

• The code change is tested and works locally.
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation if necessary
• There is no commented out code in this PR.
• My changes generate no new warnings (check the console)